main.py

@@ -118,24 +118,32 @@ def delete_session_file(lensman, session, name):

                     conn.commit()
              

                 
              

                 
              

                -def get_new_files(lensman, session, maxt):
              

                +def get_new_files(lensman, session, maxid, maxt):
              

                     _, thumb = get_session_dir(lensman, session)
              

                     files = glob.iglob('{}/*'.format(thumb))
              

                     news = []
              

                     for file_ in files:
              

                         logit('/fetch_thumbnail', file_, key='globfile')
              

                         if not file_.endswith('.tmp'):  # Whether 'xxx.tmp' or not
              

                +            # Photo Name
              

                             photo_name = file_.split('/')[-1]
              

                +            # Photo_id
              

                             photo_id = photo_name.split('.')[0]
              

                +            # Thumb Path
              

                             thumb_path = file_.replace('{}/'.format(ROOT_PATH), '')
              

                +            # Origin Path
              

                             origin_path = thumb_path.replace('thumbnail', 'origin')
              

                -            if int(photo_id) > maxt:
              

                -                insert_session_file(lensman, session, photo_id, photo_name, thumb_path, origin_path)
              

                +            # Return When Photo_id Large Than Maxid
              

                +            # Solve APP Doesn't Get Photo When Timeout
              

                +            if int(photo_id) > maxid:
              

                                 news.append({
              

                                     'id': photo_id,
              

                                     'name': photo_name,
              

                                     'path': thumb_path,
              

                                 })
              

                +            # Insert When Photo_id Large Than Maxt
              

                +            if int(photo_id) > maxt:
              

                +                insert_session_file(lensman, session, photo_id, photo_name, thumb_path, origin_path)
              

                     return news
              

                 
              

                 
              
@@ -193,9 +201,10 @@ class FetchThumbnailHandler(RequestHandler):

                     def post(self):
              

                         lensman = self.get_argument('lensman', '')
              

                         session = self.get_argument('session', '')
              

                +        maxid = int(self.get_argument('maxid', 0))
              

                 
              

                         maxt = get_last_timestamp(lensman, session)
              

                -        files = get_new_files(lensman, session, maxt)
              

                +        files = get_new_files(lensman, session, maxid, maxt)
              

                 
              

                         logit(self, maxt, key='maxt')
              

                         logit(self, files, key='files')